Merge branch 'kb/maint-bundle-doc' into maint