Merge "Properly handling case when DDC is null" into main