FL-482: real add of mate mix-in