Merge pull request #4032 from nabinhait/mc4

[fix] Multi currency patch