[Olena-patches] olena: branch fixes updated: olena-2.0-581-g90d7601