Feature/vov 1872