LPS-36658

Please check it.