merge revisions of DC package

See also the `fixme` comments.