Squashed commit of the 'thorn0-fork' branch