Merge pull request #18879 from colemanw/fixDAOStyle