Merge branch 'fg/submodule-fixup'