Merge branch 'ah/doc-updates' into maint