Updated from VOV-2582 branch