LPS-37751

Hey Marc, I think this includes everything we need for this fix. Let me know if there is anything we need to change.