Squashed commit of the following done: