Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint