:lipstick: Upstream changes