Merge branch 'issue_3785' into release-0.14