LPS-44579 SF

cc/ @sergiogonzalez @arboliveira