OVT-8518: Refactoring.