Merge "Use one type for UUID (2/5)"