Feature/vov 2757

Merging into develop instead of master