Merge "Prep for new data interfaces from parsers." into main