LPS-44406 Pushed to upstream