Fix watch closer and lint errors
Merge branch 'develop' into develop-build