Merge "Ensure non null package" into sc-dev