Merge branch 'jn/t7006-fixup'