Issue #24839:honor CurrencyExchangeSense
Merge pull request #547 from garyhgohoos/24839

Issue #24839:honor CurrencyExchangeSense