Merge branch 'vdev' into develop
deletion of old colde