Today
Merge from oct2025_merge