Merge branch 'mz/reset-misc'