Merge "Squashed commit of the following:"