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