wip
Merge branch 'amqp_fixes'