Merge "Used LinkAddress insteaad of InterfaceAddress"