Merge upstream changes from Netflix/Lipstick