Merge 3.6 (issue #27942)