Merge pull request #19362 from dhewg/dsl