LPS-41267

\cc @robertoDiaz