[Olena-patches] milena r1736: Work on conditional inheritance done