Merge "Ensure non-empty SvInfo is received" into sc-dev