CSTM-1128: Guppy's Links