LPS-39662 Pushed to upstream