This is untested and I'm not to sure how to test it.
The code itself is basically stolen from the other branch, that's used when the queue is full. (Line 1095) Hope this tackles the bulletpoint from here #2201
@feaneron