Merged AMQP partitioning queue back into main