Merge branch 'jl/submodule-rm' into next