Moved to base.AddressMulti in CLE/CLD