Feature/vov 2940