Issue #23225:more progress