Issue #20120: Merge from 3.5