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