Merge branch 'mg/wt-status-mismarked-i18n'