Feature/vov 1678