Merge change 3769 into donut

* changes:
  Squashed commit of the following: