Re: [Olena-patches] [Olena] #174: Merge back branch cleanup-2008 into the trunk