Merge branch 'release/1.0'
Merge branch 'release/1.0'
Corrected query conditional.
Merge branch 'hotfix/1.1-Fix-Query' into develop