[Olena-patches] last-svn-commit-533-gf8cd44e Merge remote branch 'origin/next-next' into exp/next-build-ok