LPS-45508 Pushed to upstream