Merge change 3558 into donut

* changes:
  Fix the build