Merge branch 'ph/irq'