Merge branch 'bw/submodule-branch-dot-doc' into maint