ITI-2208: Fix currency related to