LPS-33990

Please review.