Merge branch 'hotfix/1.1-Fix-Query'
Merge branch 'release/1.2'
Fix query.
Merge branch 'hotfix/1.2.1-Query' into develop