Merge "Fix the comparison between opaque parameters"