Merge change 1394

* changes:
  Squashed commit of the following: