Merge "Match upstream API change" into main