Issue #23507:initial commit