[Olena-patches] 1940: Create branch cleanup-2008 from trunk/:1939.