Merge change 748 into donut

* changes:
  Fix the build.