Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next