LPS-37266

This has already been reviewed by @ipeychev and @natecavanaugh