Merge "Change API format in the map file." into main