Merge branch 'mt/rebase-i-keep-empty-test'