Merge branch 'hotfix/1.2.3'
update/fix path/file names
Merge branch 'hotfix/1.2.4' into develop