[Olena-patches] olena-2.0-217-g4d0f7e2 Merge branch 'next' into unstable/scribo