Cg/dd rebase