Merge branch 'hotfix-0.14.3'