Merge branch 'mm/two-more-xstrfmt' into maint