Merge branch 'ta/new-command-howto'