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