LPS-38351 Use the new API