Merge branch 'sb/submodule-rm-absorb' into maint