Changes from SubmoduleTest 2.