LPS-49544 replace usages of new method where appropriate