LPS-40214 Pushed to upstream