Merge pull request #4749 from dhewg/dsl