MERGE: Close #13500: Hitting EOF gets cmd.py into a infinite EOF on return loop