LPS-22792

LPS-22792 Continue Work