Merge branch 'bg/maint-add-all-doc' into maint