Merge "Ensure DDC is not null" into sc-dev