Upstream merge, and also merge patch 17 into patch 10
Merge all QPT patches into one patch