Issue 7936 by sgl: Adding more hooks