Updated the submodules for v3.1 and v4.0