Merge branch 'rt/format-zero-length-fix'