Added changes from Linus's branch to main branch.