[MERGE][TASK 9431] TOS Phase 2: Tariffs