[Olena-patches] last-svn-commit-227-g2290b5c Import files from milena/sandbox/green.