Merge branch 'nd/ita-wt-renames-in-status' into maint