match dao refactor branch
Merge branch 'master' into pull-requests