KAZOO-1251: Updated stepswitch bridge code