Merge "Properly set all data fields" into sc-dev