Issue #28759: Merge 3.6.