FL-482: add mate set