Merged the fix for bug 87350