LPS-33649

Please review.