Issue #20254: Merge from 3.5