Merge branch 'hotfix/1.0.14'