Lps 47071

Brian, still a lot more commits will come under this ticket, please leave it open.