Merge pull request #1399 from jkczyz/2022-03-scoring-tweaks