Merge upstream master into pr-3966-irq-latency