Lps 52298

I know that Brian usually likes smaller pull requests, but since these commits all rely on each other I wasn't quite sure how to split them up.