Merge branch 'jk/mv-submodules-fix' into maint