CSTM-6048: Aisling's Links