Merge branch 'jk/run-command-formatfix' into maint