MD-Staff: Address type global replace

CHG0078839 MD-Staff: Address type global replace