LPS-48253 Use new API