NEB-3275: Matthew's Links