Merge branch 'irq-pio'