frdel
Squashed commit of the following:
e287d47