Merge branches 'release', 'dmi' and 'misc' into release