Restore Opaque
behavior to coherence check
#99666
Merged
Opaque
behavior to coherence check
#99666