Updated from VOV-2815 branch