LPS-35593

Previous pull request: sergiogonzalez#998