Merge branch 'bc/t3430-fixup'