LPS-32714 Pushed to upstream