Merge change I71c41a7c into eclair

* changes:
  Remove GAIA string