Merge 3.5 (issue #28399)