Merge branch 'en/t6036-merge-recursive-tests'