NEB-1585: Oliver's Links