Complete first draft of DB
Merge branch 'CMS-1' into release

Complete first draft of the DB