Merge branch 'en/rename-directory-detection'