Use dev-master branch after dev-develop removing
Merge branch 'master' into refactor/product_query_builder