Integrate upstream changes