LPS-33791

Please review.