Issue #23253:tweaks