LPS-42800

New pr with added ui message