Merge "Allow NLS metadata fields to use name strings" into sc-dev