Merge 3.5 (issue #28990)
3 files changed