Merge branch 'release/1.1.1'
Merge branch 'release/1.2.1'
adding back the $query so I can pass hints
new version