Merge branch 'en/directory-renames-nothanks'