fix device specific cherry-pick logic
sync with more threads