LPS-43570

Please review.