Adding support for query scopes, fixing bug in test
Merge branch 'release/2.0.4'