Merge branch 'cb/t7810-test-label-fix' into maint