Merge "Fix UID logging." into main