case 2925 - Some VoxB fixes.
Merge remote-tracking branch 'origin/case-2925' into develop