Merge pull request #3204 from nabinhait/v4.x.x

Maintain same currency exchnage rate while mapping