Merge "Fix RabbitMQ alerts"