cherr-pick : Fix merge errors