Merge pull request #7553 from eileenmcnaughton/daotest