update replace old natiinal id method
Merge branch 'dde_upgrade'