Merge "Fix the comparison of opaque types that have multiple definitions"