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