Merge branch 'add-more-command-names'