Issue #23212: merge from 3.4