Merge branch 'tb/banned-vsprintf-namefix'