Adding type for uid element
Merge upstream