SwitchYard: applied changes from SWITCHYARD-1772