Merge remote-tracking branch 'origin/next_query_deferred' into next_query
Merge remote-tracking branch 'origin/next_query' into next_query