Merge change 1927 into donut

* changes:
  Fix build breakage