#3531 Change cherry-pick
terminal-run commands into normal commands w/ proper error handling
#3814
+114
−55