NA OFI: make sure class does not block if domain does not support it
NA OFI: make sure class does not block if domain does not support it

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury