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