[SWITCHYARD-1934] - Fixed JBDS issue