fix patch cherry-pick