Issue #23180: merge from 3.4