Issue #26939: Merge 3.6.