LPS-45350

Hi Brian,

this is the re-based version of the code as you requested it from @matethurzo.

thanks,
Daniel