Merge "Add a protection for the null UID corner case" into main