Merge branches 'fixes' and 'misc' into for-next