Merge branch 'jk/follow-rename-score' into maint