SC-2617: Diamond's Links