A bit surprising. Are you sure this PR is based on the latest Gaia master?