Merged upstream change.