Compatible with gaia in ff nightly