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