New hook version
Merge branch 'master' into user