Merge branch 'feature/fix_pricing' into develop

* feature/fix_pricing:
  fix pricing