Merge branch 'merge' into next

We want to bring in the latest IRQ fixes