Feature/vov 2763