Merge "Revert "Change default for group alert behavior"" into oc-dev