Merge branch 'mb/config-document-include' into maint