Merge branch 'hotfix/1.2.11'
Fix a path issue
Merge branch 'hotfix/1.2.12' into develop