Merge branch 'hooks-configuration'