(COMMIT-66) CommonDao updated
Merge branch 'barnch-dao'