KIJIMRLIB-14. Second pass.