* Merged patch for bug 84605 from PE2 branch