Merge "Fix ExcludeWatch"