[Olena-patches] 4435: Do some refactoring for best future olena integration.