Issue 26931: Merge 3.6