LPS-32352

Please test my changes, thanks.