Merge tag 'v0.1.17-1' into develop

Minor release improving FluentQuery
 bump version
Merge branch 'release/v0.1.18'