LPS-42225

Already reviewed by: @sergiogonzalez