* merged fix for 85502 from trunk into diablo-pe1 branch