[Olena] Merging trunk/ to branches/cleanup-2008/