Merge "[Catalyst] Add multiple flags for 25Q3" into main