Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next