Merge branch 'jl/submodule-deinit' into next