Query builder getters/setters

UT to be rebased in a sec

config ...

Spaces to tabs
Updates after PR
Merge pull request #1793 from Cinderella-Man/1.3.0-querybuilder

[1.3.0] Query builder getters/setters