[Olena-patches] olena: branch fixes updated: olena-2.0-585-g45b2fd9