[Olena-patches] olena-2.0-444-g5d57444 Merge branch 'next' into unstable/scribo