Issue #23207: merged fix from 3.4.