Feature/vov 2329 rebase

The tests are passing! Quick, merge it!