Merge from 3.3 (issue #15209)