Merge branch 'ab/hook-api-with-stdin'