[Olena-patches] proto-1.0 237: Various updates.