Merge branch 'sp/amqp'