Merge "API: clean up stale baseline entries" into main