Fix a path issue
Merge branch 'hotfix/1.2.12'