Lina, update to get latest changes from gms-mvn