CSTM-0937: Puddle's Links