Merge branch 'en/directory-renames-nothanks-doc-update'