case 3417 - Hardcoded currency.
Merge branch 'case-3417' into test-dev