SBR-5798: Crys's Links