Merge branch 'ab/hooks'