fix prod to product alias bug
Merge remote-tracking branch 'origin/develop' into price-splits