#3534: Change rebase
terminal-run commands into normal commands w/ proper error handling
#3820
+278
−25