Merge change 2299 into donut

* changes:
  fix build breakage