CSTM-5929: Frankensweetz's Links