Merge branch 'bk/submodule-in-recursive-merge' into next