Merge change 1278 into donut

* changes:
  Squashed commit of the following: