Merge branch 'jk/t4205-cleanup' into maint