pricing changes
Merge branch 'hotfix-pricing'