Merge branch 'mz/empty-rebase-test' into maint-1.7.11