Merge branch 'hotfix-simpleQuery' into dev
Merge branch 'dev'