Merge with upstream (Fix bug #67716 - Segfault in cdf.c)