LPS-44724 Pushed to upstream