Merge branch 'jk/mv-submodules-fix'