LPS-50857 need to add UID