Issue #26934: Merge 3.6