Bunch of patches for testing, not for production. Will clean up soon
Upstream merge
Merge patches 14 and 15