Merge "Language support fix for portal"