fix cherry-picks