MAJ DAOs + Tests
Merge origin/master