Issue #23594: merge 3.4