Ported PP Express' changes from 1.5.6 to 2.0