* Merged PE1 fixes into the pe1 branch from the trunk.