squashed IRQs patches from riemervdzee github