Merge branch 'enhancement/configurable-exchange-queues' into enhancement/refactor-to-ext-amqp