LPS-35935

Amos, can you review. Thanks.