EF-22 Updated submodules on efforia