Cherry-picked mlucy_3288