Merge branch 'mg/doc-bundle'