Merged fix for bugs 87174, 86213 from trunk