JBTIS-287 - fix SwitchYard