Added upstream changes.