Feature/vov 1717