Merge fix for alerting