LPS-38354

/cc @natecavanaugh @eduardolundgren