Merge branch 'en/t6036-recursive-corner-cases'