Issue #28849: Merge 3.6.