Merge branch 'en/merge-recursive-directory-rename-fixes'