I'm pretty sure this merge is incorrect. Because a few lines down the wake-up queue is checked for emptyness and now it's always emtpy.