LPS-32132

Forward the pull request from Julio