LPS-41403 update code for bnd API changes