Merge "Fix Contrail alerts"