CSTM-2274: Saffron's Links