Set watch task to run test:cli
Merge origin/master