Merge branch 'intel-next'