Merge cdb branch with cdb dev