Latest upstream changes.