--- # RabbitMQ Additional Changes