Merge branch 'issue_4161' into hotfix-0.14.2