Merge "Queues, queues, queues and input." into jb-mr2-dev