Merge branch 'jk/xstrfmt' into next