Fix gznt_rm_cherry_pick_node