[Olena-patches] olena-2.0-39-g7307887 Merge branch 'next' into unstable/scribo