LPS-39810 Pushed to upstream