Merge branch 'je/hooks'