BUG-10406 Addendum makes better use of MasterAddressTracker