[Olena-patches] milena r1789: rms