Perception currency fixes

Merged Uriel Mayo requested to merge perceptionCurrencyFixes into 15.0-stage

Merge request reports