LPS-31496

Nate, can you make this a high priority review? /cc @mikemanyoung @brunobasto @hhuijser