LPS-47664 Adapt to new interface