Fix is_disjoint
check for supported environments
#6902
+115
−1
Merged