Merge branch 'wtk/submodule-doc-fixup' into maint