unhook() is working
Merge branch 'master' into namespaces