Merge !722: small command input fixes

30 jobs for nightly
in 23 minutes and 38 seconds and was queued for 4 seconds
Scheduled