[OE-3874] Scheduling: Moved firm switcher inline