Merge branch 'issue_4140' into hotfix-0.14.2