Query abstraction
Merge branch 'master' into ours