update Gaia 2.0 Trunk