Merge "Populate some missing fields in TrackData" into rvc-dev