[Olena-patches] proto-1.0 121: Fix bugs.