Issue #23255:address code review comments