Merge branch 'vdev' into develop
revers -> erase and a new erase