fixed cherry-picks for last commit