[FWD] LPS-50619

cc/ @adolfopa