[Olena-patches] last-svn-commit-643-g8de09d4 Merge branch 'exp/green' into next-build-test