Fix merge conflict
Fix merge conflict
Merge branch 'hotfix/1.0.5'