Merge branch 'ab/hooks-regression-fix' into maint