Merge pull request #1133 from jkczyz/2021-10-expand-scorer