Merge branch 'stable/irq.rework' into stable/irq.cleanup