cherry-pick dsb