Merge pull request #6048 from dhewg/dsl