[79203538] NLS support

https://www.pivotaltracker.com/story/show/79203538