LPS-39077

Hey Eudaldo, just rebased this. There is one commit I missed from 39399. I think we can send it together with this. I'm running the Jenkins test now...