Merge branch 'hotfix/fix.watch'
fix the watch location
Merge branch 'master' into develop