Merge change 8803

* changes:
  Squashed commit of the following: