Merge branch 'hotfix/1.1.4'
Fix path generation
Merge branch 'hotfix/1.1.5' into develop