Merge branch 'jk/xstrfmt'