Merge pull request #23362 from demeritcowboy/dao