Issue #20100: Merge from 3.5