Merge branch 'jk/follow-rename-score'