Merge branch 'mz/maint-rebase-X-fix' into maint