Feature/vov 2143