Forward port [17015] + a few more i18n fix