Merge 3.6 (issue #28635)