[SWITCHYARD-1546] - Allow skipping WS override