generic and query edited
Merge branch 'master' into decorator_test