cleaning up the last DSM / SVM
Merge branch 'blopeur-dev' into dev