LPS-42822 Use the new method