Issue 18394: Changes to currency widget