add hookin feature
Merge branch 'f-hookin' into dev