Merge branch 'jl/submodule-tests' into next