Merge !722: small command input fixes

31 jobs for nightly
in 17 minutes and 19 seconds and was queued for 10 seconds
Scheduled