Merge "Add channel group for alert windows notifications" into oc-dev