Merge newer Dcep developments into classic