Merge branch 'linus_origin' into hotfixes