Merge branch 'sb/submodule-deinit-all'