Merge pull request #16178 from seamuslee001/regen_dao