strategy commit
Merge branch 'pricingStrategy' into develop