LPS-45040

FYI @sergiogonzalez