Merge branch 'jk/run-command-capture'