Merge pull request #2144 from Memphiz/canotify