NEB-2655: Collin's Links