Merge branch 'en/fill-directory-exponential' into master