Autodetect CLI command
Merge branch 'dev'