CSTM-4371: Feliz's Links