Issue #23615:avoid extraneous prompts