D2K / C&C updates

This is a fixed rebase/merge of @psydev's #3184 and #3205.