Merge branch 'kb/send-email-fifo'