Issue #21593: Merge from 3.5