Issue #21864: Merge from 3.6