Merge branches 'misc' and 'soc' of .git into next