Merge branch 'ah/doc-updates'