Merge pull request #1660 from anandpdoshi/hotfix

Fixed multilingual UOM issue