LPS-45912

Pushed to upstream cc/ @ealonso @mhan810