merge
cherry-picked
new SQS
more cherry-picking
Merge pull request #236 from nikhan/new_SQS

message references and a modified SQS block