Merge "Suppress HUNs according to group alert behavior" into oc-dev