LPS-43227

\cc @samuelkong 

Hi guys,

Could you please review me changes? and if those changes make sense for you and work fine, then I'll send it to Brian.

Thanks!!!

Eudaldo