Merged [18631] and [18632]: Localization updates