Transforming paths into directories.
Merge branch 'hotfix/2.1.4'