Merge branch 'dss-devtree-cleanup'