Command Includes
Merge branch 'command-includes'
Pass template directory to command-includes