Merge branch 'nd/ita-cleanup' into maint