OVT-3755: Improvements.