Account for selector specificity when merging extend_unsafe_fixes
and override extend_safe_fixes
#8444
+251
−41
extend_unsafe_fixes
and override extend_safe_fixes
#8444