handling duplicates
Merge branch 'dde_upgrade'