Issue #24077: merge from 3.4