Merge branch 'dt/submodule-rm-with-stale-cache' into maint