NEB-1526: Diamond's Links