Merge change 1899 into donut

* changes:
  Fix the build