LPS-33971

Recommit, please review. Thanks.