fix watch
Merge branch 'develop'