Merge change I90b4c0e7 into eclair

* changes:
  Fix Eclipse sample tests.