Merge branch 'jn/run-command-error-failure' into maint