Closes #13695 & Closes #25580

git-svn-id: https://easyhook.svn.codeplex.com/svn@74633 142e9c35-602f-4880-9f37-ec48a24daa6a