Merge branch 'cl/t9001-cleanup' into maint