Merge branch 'nd/packobjectshook-doc-fix'