Merge pull request #11344 from eileenmcnaughton/currency