CSTM-5535: Margarita's Links