Merge change 26686 into eclair

* changes:
  Fix broken build.