Merge branch 'irq/core'