updated norm version with refactoring on QueryConditions
Merge branch 'master' into releases