Merge 3.5, issue #14209