7.0 new query

Merged Gabriel Davini requested to merge 7.0-new_query into 7.0-stage

Merge request reports