Merge branch 'jb/t8008-cleanup' into maint