"Cherry-Picked" Claudy_Input.cs (1.5)