Merge branch 'sb/mv-submodule-fix' into HEAD