Issue #28950: Merge 3.6.