Merge branch 'issue_4048' into release-0.14