Lps 45558

I am sorry, Brian. This is a big one.

The webcontent regression was too bad, I had to change a lot to get it back.

Let me know if you need any explanation, or you want me to break it into smaller pulls.
I keep them in one pull is because it is easier for Dante to run test on it.