Merge pull request #2966 from oskar456/addrwatch