LPS-47565

The API changes will come after this is approved.