Localization phase 2.
Merge remote-tracking branch 'origin/sprint4' into sprint4
Localization cleanup.