[Olena-patches] proto-1.0 241: Fix hit-or-miss closings