Merge branch 'mz/rebase-tests'