CSTM-4542: Estelle's Links