#3532: Change merge
terminal-run commands into normal commands w/ proper error handling
#3819
+155
−23