LPS-45420 SF

Hi @gallindo, could you please double check if everything is working properly?

Please send me another PR.

Thanks