cherry-pick des merge