Merge branch 'jk/strip-suffix'