Merge branch 'mz/maint-rebase-stat-config' into maint