add some hooks
Merge branch 'master' into v1.5.4