Merge "Fix out set parameters success return code"