Merge branch 'jk/war-on-sprintf' into maint-2.7