Merge "Add some clarifications around UDS" into main