Merge "Fix the v2 descriptor handling."