Merge branches 'misc-up-now' and 'platform-drivers' into release