mainline broker
Merge branch 'feature/sqs_broker'