Merge branch 'jl/submodule-diff'