Issue #23253:setup changes