Merge branch 'mz/rebase-i-verify' into next