Merged fix for bugs 87039, 87093 from trunk