Merge change 79

* changes:
  Squashed commit of the following: