LPS-39399

Hey Eudaldo, as per our discussion with cc @jorgeferrer, I'm sending this to you to review. I'll send you the pull that is using these changes so that you understand better. Please note that commit is not ready to be sent to Brian (will need formatting, but I'd like to wait for these to get in before I make it final). Thanks, Zsolt.