Merge "Continue populating legacy data structures." into sc-dev