Merge "Remove 32K limit from queries with collection parameters"