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