Merge branch 'jl/submodule-mv'