LPS-42051

 \cc @robertoDiaz