cherry-pick notes