Merged fix for bugs 86176,86408 from trunk