Squashed commit of bug-1