Merge branch 'jk/maint-tformat-with-z'