CSTM-1333: Acorn's Links