Merge branch 'fix-suffix-folding'