NEB-1799: Mitchell's Links