Merge branch 'hook-configuration'