[Olena-patches] olena-2.0-53-ga20c065 Merge branch 'next' into unstable/scribo