Merge "Add queries: default and for KPI1" into release/2019.2.0