Merge "Allow SQL queries with long field list to wrap"