CSTM-1690: Kai's Links