Update from v1.2 gaia

These are the only changes when updating