Merge "Handle null from unitialized live data" into sc-v2-dev