Merge branch 'bc/t5505-fix'