Issue #12946: Merge from 3.5