LPS-42822 Add new method
LPS-42822 Use the new method
LPS-42822 SF