LPS-44847

Preston requested this go through Jon Mak.