(ABM-573) query tuning
Merge branch 'gsc' into develop