Issue #24603: merge from 3.4