Merge branch 'en/merge-directory-renames'