Merge "Fix behavior of Hooks class."