Remove merged cherry pick