Issue #24540: merger from 3.4