Merge branch 'hotfix-0.14.2'