Merge branch 'jn/am-doc-hooks'