Squashed commit of bug-2