Merge "Add aggressive query mode" into main