Merge "Correctly serialize population" into sc-dev