Issue #23352: Merge from 3.4.