Remove dsm
Merge branch 'feature/WKS-223' into develop