Merge change 1564

* changes:
  Update build version to Eclair.