Merge branch 'irq/for-block' into irq/core