Merge branch 'nd/wt-status-align-i18n'