Merge Jezza's branch

This will need to be manual, @ntzrmtthihu777