more reorganization
Merge branch 'vdev' into develop