Cherry picked - 250c358354a38ed4abe475fa5cebbd10628037d0