case 3378 - Refactor of voxb.
Merge branch 'case-3378' into develop