:lipstick: Upstream Changes