new SQS
more cherry-picking