Merge EOY 2025 (@reubenfillies) / Cosmos