LPS-37946

/cc @natecavanaugh