NEB-2679: Connor's Links