LPS-28404

Made some changes, retest please. Thanks.