Changes to .../Serice/AlertManager.php and elsewhere