Multi currency fixes

Merged Uriel Mayo requested to merge MultiCurrencyFixes into 15.0-stage

Merge request reports