Merge pull request #2934 from nabinhait/develop

Pricing Rule Issue