[Olena-patches] last-svn-commit-1001-g6342ded Merge branch 'master' into next-next