Merge branch 'jl/submodule-conflicted-gitmodules' into next