Merge branch 'sb/submodule-misc-cleanups'