Issue #21709: Merged update from 3.4.