DAO and tests
Merge origin/master