LPS-51555 SF

cc/ @adolfopa