Merge branch 'thread-irq-simpler' into devel