Squashed commit of the following:

Squashes