Merge change 22132 into eclair

* changes:
  build fix