BS-8347
integrate new connector