Merge "Merge latest API into single file before checking compatibility" into main