LPS-47015

Let me know if you want me to break this commit up, this is the biggest of the commits.