Integrate upstream changes.

MFC after: 1 week