LPS-36365

cc @sergiogonzalez