Stop cherry-picking, start merging

3 points | by ankitg12 8 hours ago