updates cdb
Merge branch 'master' into issue-1326