Merge branch 'master' into develop
Product price calculation fix
Merge branch 'develop'