Re: [Olena-patches] cleanup-2008 6fd64da: Merge last changes from trunk to cleanup