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