Merge "Fix "Invalid columns in request:" errors, when there are multiple columns"