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