Scrubbed DStar from main branch
Merge branch 'master' into tests