NEB-1721: Nessie's Links