LPS-28364 [TECHNICAL SUPPORT]

Made some changes, please retest. Thanks