Merge branch 'an/shallow-doc' into maint