Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint