Merge "Fix C versions of DC calculation functions"