:lipstick: Integrate upstream changes