BS-10784, fix merge issue