Merge branch 'en/merge-recursive-fixes'