LPS-48259

cc/ @jhinkey