[Olena-patches] olena-2.0-404-g7c5e9cc Merge branch 'exp/trace' into unstable/scribo