Merge branches 'release' and 'dmi' into release