Merge in bug fix for 456080.