LPS-33278

Hey Jon, we're sending this review to you since Nate is out. Can you do your review, and then forward this on to Shinn? Shin said that he will send it to bchan after your review. If you need some use cases for testing, let me know I can paste them into a comment.