Upgrade to DC v3.18