[Olena-patches] r2618: Work on INIM classification