manual cherry-pick