Merge change 4411 into donut

* changes:
  Squashed commit of the following: