Merge "Add missing numQueries increment."