[Olena-patches] r2758: Big cleanup