Merge branch 'jk/t6300-cleanup' into maint