Switchyard

PR for jbtis-4.1.x