[Olena-patches] olena: branch fixes created: olena-2.0-578-gc2c03cd