LPS-51555

cc/ @adolfopa