Merged fix for 86137 from trunk