Merge branch 'ft/diff-rename-default-score-is-half'