MB-35 #comment adding the necessary changes to use our amqp