LPS-33795

Please review.