Switched back to Gaia master branch