Issue #12965: Merge from 3.2.