Merge pull request #17395 from seamuslee001/update_DAO