LPS-39282

Hey @shuyangzhou. @natecavanaugh wanted me to send this branch over to you today for a performance test. Let me know if you have any questions.