Merge branch 'hotfix/hotfix'
Query fix
Merge branch 'hotfix/hotfix' into develop