Merge branches 'misc', 'nes' and 'srp' into for-next