Lps 48099

Brian, there will be a lot more following commits to this ticket, please leave the ticket open.