Merge branch 'run-command' into run-command-plus