Merge branch 'sent-queue'