Merge change 7332

* changes:
  Squashed commit of the following: