Pricing Strategy part 1.
Merge branch 'mooFeatureStrategy' into develop