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