Merge change 1404 into donut

* changes:
  Fix the build